Merge "PackageManager: Clean up code related to foreign dex use"