am 45b9dca3: am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev

* commit '45b9dca3e4cee51222f84b1f606bebe1cdf49ed1':
  adb: Prevent registering usb_disconnect twice