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

Change-Id: I41da6719f6d9fc4a358bb8a0d99358360d779182