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

Change-Id: I3cb4380aeb347bf255c4fb6f4430db62e4a83407