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

Change-Id: I0528eae78dc6129b6f62dbc5b3e5d460362f389c