Merge "Add fastboot mode to recovery" am: 19a5316412 am: b0851cf8c4
am: b51ba3c8fa

Change-Id: I73d47a3fdaedc0e024f1759c030b31d865f376fc