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

Change-Id: I89181a9c04865e4e1a398833f2b712f6a2d1d819