Merge "Use AndroidManifest to fill PackageInfo from apex"