clean up reboot to main system and remove old useless variables

Change-Id: Idf8cda0639e3fa5e6073b196a85899c57ca18e9b
Merge "clean up reboot to main system and remove old useless variables" into cm-11.0