Merge changes Ia7add63e,Ic7571dae

* changes:
  Split dump and annotate users of mPackages lock
  Split PackageManagerService into subclasses