Merge "Update vold to use KM4.1" am: 6c5f302a90

Change-Id: I5393adf2503586c87414a302fa24d381863bccbf