am 7e40e67f: am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread

Merge commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039'

* commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039':
  Add "none" for vold and deprecate mkobb -c