Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread