Revert twrp + mr stuff (ill build this separately)

Change-Id: Iaf6ac0fc371b68371c10dd22c3e5f48666b74e03