DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f am: 5cee87ea25 am: 09b5b49e9b  -s ours am: 8b2a975e12 am: 557d55afd5 am: fb1584b011
am: e3dbcd39ca  -s ours

Change-Id: I45a7885e9672064661a2d0b4995a62d6620472e7