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

Change-Id: Ic0c3050f457e3ccdd7ec101b74e61aae7a49f1b1