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

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