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

Change-Id: I705254b519ec3fbf9798500d525b1f74c63f8153