Merge changes I761a9e5c,I7f03720f

* changes:
  Move shared library info out of PackageManagerService (3/n)
  Move shared library info out of PackageManagerService (2/n)