Merge "Preserve order of shared library files"