Merge "Preserve order of shared library files" am: 596bb64796
am: e74db7c7e2  -s ours

Change-Id: I52c45674dc6ddf972694d4e4dc71856453e68a96