Merge "adb: turn darwin/windows builds back on, hopefully fix them." into klp-dev am: b19b5fe08c am: 50fb0a1f11 am: 85b6b13175 am: 4775e66996
am: 750b4c3c5f

Change-Id: Ib44cbbcfe4ecba200fff8db0bf2cc2d826870577