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

Change-Id: I67eba7b8c6cf076314f5848e4623419931c5131a