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

Change-Id: I5bfe707e176d742f6ab1bd86b7c5fb65ce4fdc33