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

Change-Id: I37bd5978fd4ca52eda6960116103d321eef432fb