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: c1167dd4c9 am: d7cdf29c99
am: a8ce875cfb  -s ours

Change-Id: I309fb21b09f18f13d89db66ed01558b0b9df429e