am 2c93697c: am c4f8fa7b: Merge "Link libraries needed for Darwin adb tests."

* commit '2c93697cfc5371afd11e486750fbabb734316ddc':
  Link libraries needed for Darwin adb tests.