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

Change-Id: I7f73c6df381e33c37a38a28af3079dbb453be042