Update to Chromium //base at Chromium commit 3e81715e6d3a4324362635aea46ce1f1a163cca1.

android/java/src/org/chromium/base/library_loader/ModernLinker.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.base.library_loader;
 
 import android.os.Bundle;
 import android.os.SystemClock;
 
 import org.chromium.base.Log;
@@ skipping 352 matching lines @@
         synchronized (mLock) {
             assert mPrepareLibraryLoadCalled;
 
             String dlopenExtPath;
             if (zipFilePath != null) {
                 // The android_dlopen_ext() function understands strings with the format
                 // <zip_path>!/<file_path> to represent the file_path element within the zip
                 // file at zip_path. This enables directly loading from APK. We add the
                 // "crazy." prefix to the path in the zip file to prevent the Android package
                 // manager from seeing this as a library and so extracting it from the APK.
-                String cpu_abi = nativeGetCpuAbi();
-                dlopenExtPath = zipFilePath + "!/lib/" + cpu_abi + "/crazy." + libFilePath;
+                String cpuAbi = nativeGetCpuAbi();
+                dlopenExtPath = zipFilePath + "!/lib/" + cpuAbi + "/crazy." + libFilePath;
             } else {
                 // Not loading from APK directly, so simply pass the library name to
                 // android_dlopen_ext().
                 dlopenExtPath = libFilePath;
             }
 
             if (mLoadedLibraries.containsKey(dlopenExtPath)) {
                 if (DEBUG) {
                     Log.i(TAG, "Not loading " + libFilePath + " twice");
                 }
@@ skipping 110 matching lines @@
      * @param loadAddress load address, which can be different from the one
      * used to load the library in the current process!
      * @param relroPath Path to the shared RELRO file for this library.
      * @param libInfo libInfo instance. On success, the mRelroStart, mRelroSize
      * and mRelroFd will be set.
      * @return true on success, false otherwise.
      */
     private static native boolean nativeCreateSharedRelro(
             String dlopenExtPath, long loadAddress, String relroPath, LibInfo libInfo);
 }