Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev
am: b19b5fe08c

Change-Id: If4c9afd09de879519e4fd38d3b792af211c44d29