Merge "Don't require bootloader fastboot for VTS compliance." am: ac892d7569

Change-Id: Idd26ac600b75c1ea529edbf008d161e1e2790fd8