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 am: ffcd14a9b9 am: 7149e3e72a
am: 058bae82ed

Change-Id: I228d82294d327907b1c8d42f5f359a8c5e8f6b2c