Merge "Test: Basic bootloader tests via fastboot" am: cbbc907a4d
am: 9478bf8b40

Change-Id: Ie202777a9dc60997424628ec38a019d5fbe03eef