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

Change-Id: I130be434938733fbc3f6ecb9c23f8cdaeac4dba4