[automerger skipped] Merge "Update vold to use KM4.1" am: 6c5f302a am:...

[automerger skipped] Merge "Update vold to use KM4.1" am: 6c5f302a am: 53f8e2df am: 3660bf98 -s ours
am skip reason: Change-Id I4574a2f6eead3b71d1e89488b496b734694620c7 with SHA-1 ae8f06fe is in history

Change-Id: I98403470def2e60e7ff5b8b6ee55c5a34f4e463a