fix reboot recovery + TWRP config changes

Change-Id: Ic72f6d3a32e941fe30e821bb016639980e9c7afc
fix C lang # break

Change-Id: I77c541d7e22366a0fd0e49e35a5b51634e705afb
Merge remote-tracking branch 'origin/cm-10.1' into cm-10.1