Merge changes from topic "androidpackage"

* changes:
  Critical fixes for AndroidPackage migration
  Revert Revert PackageParser#Package fixes
  Revert "Revert "Deprecate PackageParser#Package""