otter2: Trying to fix up reboot into recovery

Some users claimed it never worked, end up with the tablet shutdown instead of
reboot into recovery.

Change-Id: I14a407c476d88177b433551d0aee7939496e8da6
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0