am 100422b2: am 2e4b90e5: Merge "Dedup system shared libraries."

* commit '100422b2311a96fbbdb1ba62a9945c2637c9e861':
  Dedup system shared libraries.