DO NOT MERGE: adb: reenable (and fix) Windows build. am: 804de7a29e am: 5c4bf3d66f am: 5cee87ea25 am: 09b5b49e9b  -s ours am: 8b2a975e12
am: 557d55afd5

Change-Id: I272a8339439a871ebc54de32cd6bf8da853852de