adb: turn darwin/windows builds back on, hopefully fix them.
am: a9c0ac0c46

Change-Id: Icc58ac512edaaa0a47dda375147a832214107556