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

Change-Id: I4977bc17d446cc2b8959058e3e13ccf17e10857b