Merge "adb: actually fix the windows build." into klp-dev