am 8a5796b1: am 98a4dd48: Merge "\'usb\' doesn\'t need to be global in fastboot."

* commit '8a5796b1c54e1c3e42581ee6628fb55895998d90':
  'usb' doesn't need to be global in fastboot.