Merge "DO NOT MERGE: adb: reenable (and fix) Windows build." into mnc-dev