Factory reset: Allow passing wipe_media to recovery

Change-Id: I3b6e224064055b2eef8c2909c7d36f9a76014d70
Fix build, RecoverySystem.

Change-Id: I8c7fd35e1f352990c3d8e65cf8a0a30ab0a06297
Merge branch 'cm-11.0' of https://www.github.com/CyanogenMod/android_frameworks_base into HEAD