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

Change-Id: I9b46995864508f85c00c6c3a99ebee86632f8402