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

Change-Id: I115017c90c8ee4a7b28a2742462d157585b1edaa