Merge "Jars matching the renamed libraries."