Merge changes Ia4a2ff77,I970806e3,I47daa338 into nyc-dev am: a9e818f463
am: fad1cd0edd

* commit 'fad1cd0eddc6f16ec53eb786c455aa94341c37c7':
  adb: increase the FD table size on Win32.
  adb: bump the server version to 36.
  adb: add reconnect command.

Change-Id: If58944e776ee0ac78a498d83876021563a40029a