am 93cc2ec2: am d0f0f88e: (-s ours) am b6798ebb: am 5a1f9a3e: Merge "Remove the USB vendor id whitelist from fastboot."

* commit '93cc2ec29aebad01c2e9b53623340e236a4c5ec4':