Merge "Preserve order of shared library files"
am: 596bb64796

Change-Id: I95c1cd65ded3b3d14b7f916c8a10825399e7b8ec