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

Change-Id: Id4fb3005257d169b504d81717ecd09a2e176939d