Merge "Don't include the data dir in zygote library paths."

        makePaths(mActivityThread, isBundledApp, mApplicationInfo, zipPaths, libPaths);

        String libraryPermittedPath = mDataDir;

        if (mActivityThread == null) {

            // In a zygote context where mActivityThread is null we can't access the app data dir

            // and including this in libraryPermittedPath would cause SELinux denials.

            libraryPermittedPath = "";

        }

        if (isBundledApp) {

            // For bundled apps, add the base directory of the app (e.g.,