Merge changes Iaf0efc0c,Ia4a2ff77
am: c4f3546

* commit 'c4f3546e9ff410bf106ba6d97231be40e24e1adb':
  adb: disable tests that are expected to fail on Win32.
  adb: increase the FD table size on Win32.

Change-Id: I4883966f32de7cc4fbbec0e0942e667d8eeee9f6