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

Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe0 am: 50fb0a1f am: 85b6b131 am: 4775e669 am: 750b4c3c am: 667e9f92 am: c88a4dc0 am: 3b0772f7
am: 53a345a0

Change-Id: Ic6bc7537c5039ae30d079a64ac40eb2e7cc30d0c