Merge "Don't crash uninstalling updates to system apps"

        }

        final String nativeLibraryPath = (new File(libDir, apkName)).getPath();

        pkg.applicationInfo.nativeLibraryDir = nativeLibraryPath;

        // pkgSetting might be null during rescan following uninstall of updates

        // to a bundled app, so accommodate that possibility.  The settings in

        // that case will be established later from the parsed package.

        if (pkgSetting != null) {

            pkgSetting.nativeLibraryPathString = nativeLibraryPath;

        }

    }

    // Deduces the required ABI of an upgraded system app.

    private void setInternalAppAbi(PackageParser.Package pkg, PackageSetting pkgSetting) {