Merge changes Iaf0efc0c,Ia4a2ff77 am: c4f3546 am: c5b388f53a
am: 826bdace3d

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

Change-Id: I083ab867691b4f2b1fbf3a594eb2d2811a13123d