Add back TWRP changes

as per cm-11.0 branch