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

Change-Id: Ibcbd0507aa4978023ed0a444a66c93bf0fce98aa