Merge "Add sideload, fastboot as reboot targets in init" am: 3231be66ce
am: daf8cda934

Change-Id: I3a95083465bd43eccd0edcf3229207abcfb8f51a