resolved conflicts for merge of 3bbef521 to master

        // file an app came from.

        public String mScanPath;

        // For use by package manager to keep track of where it has done dexopt.

        public boolean mDidDexOpt;

        // For use by package manager to keep track of where it needs to do dexopt.

        public boolean mDexOptNeeded = true;

        // For use by package manager to keep track of when a package was last used.

        public long mLastPackageUsageTimeInMills;

        // // User set enabled state.

        // public int mSetEnabled = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;

    /**

     * This is set if we had to do a delayed dexopt of an app before launching

     * it, to increasing the ANR timeouts in that case.

     * it, to increase the ANR timeouts in that case.

     */

    boolean mDidDexOpt;