Merge changes I0ed00441,I12d46493,Ib484f701

* changes:
  Revert "adb: fix deadlock between transport_unref and usb_close."
  adb: add lock to remove_socket.
  adb: reformat comments.