updater bypass set_metadata_xxx fails from daniel_hk

Change-Id: Ie15ebcac21bb4ea6facf368e522365100ed0be39
Merge github.com:TheJBC/android_bootable_recovery into cm-11.0