Merge "vold should be fully developed in AOSP." am: de85ef5c37 am: d7b918f9f3
am: c14e93495b

Change-Id: I63f60fe2ba9c8a8652ee663baa1b214202fee39f