Some fix ups and moves for TWRP stuff

Change-Id: I85ee3f0c377d3f1c78f7625410806184c09520c0