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

Change-Id: Ibc7f6627e6f4dc246158bd7d9c44e26af4243334