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

Change-Id: I51de5bec7e0927a180b127271addb06bb0ff9e7b