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 am: e3e5ea98
am: 9d7e954e

Change-Id: Ibe3413768c5cbde65c323016b23d5342ac2e51e3