Merge "adb: add reboot-fastboot command" am: 11cbf7d711
am: 2c162bb89f

Change-Id: I135d02a46adea05ca88032aa204f484af9a2ffc7