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

Change-Id: I36f3c0d34a64e7983a95607143e863d332e5324b