DO NOT MERGE: adb: reenable (and fix) Windows build.
am: 804de7a29e

Change-Id: I4dc4d5cb64c4757894fbdff1b3e12426aa965aa7