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

Change-Id: I1a3bedeb32fdd7a4facf20a40ca8a904ffdf3ca8