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

Change-Id: I14eede001ac0abdef4c8ba3a2447b8b7b9aaaf6e