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