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

Change-Id: I09dcb207c67d9ef93d26d2258437b2e592569da7