Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090
am: 3b0772f718

Change-Id: Ibe55a81aed808569ed54d65ed1e14b55da8d2ff6