Merge "Enter into userspace fastboot only if the device supports it" am: c2e6f0410c am: 4e30d0d687
am: ff47ab3ca4

Change-Id: Iacd90f207fcfeb6c7d47412cf41a7cdaf6507772