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

Change-Id: I04df96934b6ea82865f94fcff0daf1bbd9ba63d2