Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev am: 73c59ad77c am: 015d662cb8 am: 00d389f392 am: 8dad649c6d  -s ours am: cfb8b6aea6 am: de37556d65
am: 35ed616e58  -s ours

Change-Id: I93246a9e87ac3c2480c9646d7fb0fad3d09b7c59