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

Change-Id: Ia6e73d6df06b49b3c2f9b83ac5d4c8c52917d25a