revert reboot options

Change-Id: Iff62db70fcec2aeafd00189b305703a2332790de
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_frameworks_base into jellybean