Merge "Clean up AndroidPackageApi"