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

Change-Id: I0950169fe2ff83f08f04bbecba9644dc456e2532