Merge "Partially revert ce543973" into oc-mr1-dev

                    compilerFilter,

                    dexoptFlags));

            if (pkg.isSystemApp()) {

                // Only dexopt shared secondary dex files belonging to system apps to not slow down

                // too much boot after an OTA.

                int secondaryDexoptFlags = dexoptFlags |

                        DexoptOptions.DEXOPT_ONLY_SECONDARY_DEX |

                        DexoptOptions.DEXOPT_ONLY_SHARED_DEX;

                mDexManager.dexoptSecondaryDex(new DexoptOptions(

                        pkg.packageName,

                        compilerFilter,

                        secondaryDexoptFlags));

            }

            // TODO(shubhamajmera): Record secondary dexopt stats.

            switch (primaryDexOptStaus) {

                case PackageDexOptimizer.DEX_OPT_PERFORMED:

                    numberOfPackagesOptimized++;