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

Change-Id: I76cecf9ef71ce9f631130868d402125b1e6ba9e3