Merge changes Ia59c6dbe,I13b17bcd

* changes:
  adb: fix fd leak when shell fails to create a thread.
  adb: don't dup local socket fd.