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

Change-Id: I89181a9c04865e4e1a398833f2b712f6a2d1d819