Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996 am: 750b4c3c5f am: 667e9f92d4 am: c88a4dc090 am: 3b0772f718 am: 53a345a063 am: e3e5ea98b9 am: 9d7e954e22 am: 1a7f21d108 am: 62d55cdc90 am: b928a3485a am: 641a541a6f
am: cc2d0c06e8

Change-Id: Ie0d127068d70f49f53d1c53845bfd3b7992fb53a