Merge "Reconcile secondary dex paths when compiling with adb shell cmd..." into oc-dev am: d34076385d

am: e5fffd4b83

Change-Id: I24607ab97be3acbb06cac8f2c78416ae092865eb

services/core/java/com/android/server/pm/PackageManagerService.java

@@ -8573,6 +8573,7 @@ public class PackageManagerService extends IPackageManager.Stub {
     @Override
     public boolean performDexOptSecondary(String packageName, String compilerFilter,
             boolean force) {
+        mDexManager.reconcileSecondaryDexFiles(packageName);
         return mDexManager.dexoptSecondaryDex(packageName, compilerFilter, force);
     }