Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11
am: 85b6b13175

Change-Id: I4a983b34a4c613a3226834d8683e520d6de3e617