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

Change-Id: If5eab59ed757b9f2237f36bf8d47dc6d3a161e6d