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

Change-Id: I5786f5488423ea4dd4747784f9701328fe87878d