Merge commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486' into gingerbread-plus-aosp * commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486': Add "none" for vold and deprecate mkobb -c
Merge commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486' into gingerbread-plus-aosp * commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486': Add "none" for vold and deprecate mkobb -c