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

Change-Id: I9459c5d0224274e20c5fe607b14b3582e5bd5dde