Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb
am: fa961006fd

Change-Id: I193387ccd84e4425070153a242ab320eb434b44b