Revert "otter2: Trying to fix up reboot into recovery"

This reverts commit 5453a82c2df47595fe582db855d4ef2de4248535.

just realized this is no-op, already done in init.recovery.rc

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