Revert "updater bypass set_metadata_xxx fails from daniel_hk"

This reverts commit 025d2a7d515ab2770d3347c0c6867df9e79ff16e.
Use icon_clockwork instead of icon_cid

Change-Id: I3c61faa7dc1476251cd419e641497cc83c1c6d4a
Bump version: 6.0.4.6

Change-Id: Ic5afaf86f57ab486b04692ddcc4ba8ea66edf32b
Merge github.com:androidarmv6/android_bootable_recovery into cm-11.0
Remove redundant variable definition

The same Volume variable is defined with two names in the same scope.
Merge the names and remove one of the definitions.

Change-Id: I021697b42791bc6323c5fa0d9704d27ecfe2c8c1
(cherry picked from commit d98fabe2aa8df0e421a69130c1d787705209682d)
Do data/media checks first in format_device()

Wait to define a Volume variable until data/media checks are done
in case the Volume definition is unnecessary.

Change-Id: I6912b1b2a473ea8737ea3e415e9a0172bb35eff1
(cherry picked from commit dd812777f0bbb7075da8c3da6a18612fa90e100e)
Merge "Remove redundant variable definition" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge github.com:androidarmv6/android_bootable_recovery into cm-11.0