am b3ebfecd: Merge "Fix order of soinfo links (repairs libcxx tests)."

* commit 'b3ebfecdae05e29062bf4d0234239a54a2733ce0':
  Fix order of soinfo links (repairs libcxx tests).