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

Change-Id: I85a14afc779577487b01fc3e1ae19eb284354aa5