Merge "Allow apexes to link against more libs"