Merge "Preserve order of shared library files" am: 596bb64796 am: e74db7c7e2 -s ours
am: 46080df911 -s ours
Change-Id: I7ebb756b46dd5d35c20af6179b43ad126cb7bf0b
This commit is contained in: