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

adb: turn darwin/windows builds back on, hopefully fix them. am: a9c0ac0c am: e4e1ed0e am: ddf0740c am: 8b88eb36  -s ours am: 5c81df27 am: f55e22a7 am: df519a87 am: 7f523007 am: 5a91535d am: d4b72505 am: b7178288 am: 8dac3391 am: 2a201fff
am: a198e406

Change-Id: I28568920fc02c088cd64f4b3735715b79609c08b