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

Change-Id: I5e81317eefb5d19640506881d4b6717fd92932a4