Factory reset: Allow passing wipe_media to recovery

Change-Id: I3b6e224064055b2eef8c2909c7d36f9a76014d70
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0