TWRP-ify

Change-Id: Ib537cd5cbf841842efe2bbc3816366597af95d7b
Merge "TWRP-ify" into android-4.3