adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c46 am: e4e1ed0e5b am: ddf0740c08 am: 8b88eb368a  -s ours am: 5c81df2726 am: f55e22a7d3
am: df519a87fb

Change-Id: I373b7a84b76a1e08914cedc80f26a23496b38551