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

Change-Id: I808df576abeec8ce2dd5fc8ea9d4784f4c8b6b0d