Fix issue where android device manager, etc, dont actually wipe data.

Ported from CyanogenMod/android_bootable_recovery
Patch by Koushik Dutta ("koush")
Knock these out until I actually work on them.