Merge "Share the new adb USB diagnostic code with fastboot."
am: efd8c3289e

* commit 'efd8c3289ed80dbae0813b06fb283b29273bbc66':
  Share the new adb USB diagnostic code with fastboot.