Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev