TWRP-ify

Change-Id: I747641c90759ec78d1de3b0f4ecb52f70c0432d9
TWRP-ify

Change-Id: I7e72c8fb249959e23da0ae4de140816c369c1779