GN incremental_install: Enable lib copying for all devices

build/android/incremental_install/java/org/chromium/incrementalinstall/BootstrapApplication.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.incrementalinstall;
 
 import android.app.Application;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ skipping 32 matching lines @@
 
         try {
             mActivityThread = Reflect.invokeMethod(Class.forName("android.app.ActivityThread"),
                     "currentActivityThread");
             mClassLoaderPatcher = new ClassLoaderPatcher(context);
 
             boolean isFirstRun = LockFile.installerLockExists(firstRunLockFile);
             if (isFirstRun) {
                 if (mClassLoaderPatcher.mIsPrimaryProcess) {
                     // Wait for incremental_install.py to finish.
-                    LockFile.waitForInstallerLock(installLockFile, 20 * 1000);
+                    LockFile.waitForInstallerLock(installLockFile, 30 * 1000);
                 } else {
                     // Wait for the browser process to create the optimized dex files
-                    // (and for M+, copy the library files).
-                    LockFile.waitForInstallerLock(firstRunLockFile, 30 * 1000);
+                    // and copy the library files.
+                    LockFile.waitForInstallerLock(firstRunLockFile, 60 * 1000);
                 }
             }
 
             mClassLoaderPatcher.importNativeLibs(libDir);
             mClassLoaderPatcher.loadDexFiles(dexDir);
 
             if (isFirstRun && mClassLoaderPatcher.mIsPrimaryProcess) {
                 LockFile.clearInstallerLock(firstRunLockFile);
             }
 
@@ skipping 90 matching lines @@
             for (Map.Entry<String, WeakReference<?>> entry : packageMap.entrySet()) {
                 Object loadedApk = entry.getValue().get();
                 if (loadedApk != null && Reflect.getField(loadedApk, "mApplication") == this) {
                     Reflect.setField(loadedApk, "mApplication", mRealApplication);
                     Reflect.setField(mRealApplication, "mLoadedApk", loadedApk);
                 }
             }
         }
     }
 }