Update checks for N+

build/android/incremental_install/java/org/chromium/incrementalinstall/ClassLoaderPatcher.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.content.Context;
 import android.os.Build;
 import android.util.Log;
 
@@ skipping 213 matching lines @@
     private Object[] addDexElements(File[] files, File optimizedDirectory, Object[] curDexElements)
             throws ReflectiveOperationException {
         Class<?> entryClazz = Class.forName("dalvik.system.DexPathList$Element");
         Class<?> clazz = Class.forName("dalvik.system.DexPathList");
         Object[] ret =
                 Reflect.concatArrays(curDexElements, curDexElements, new Object[files.length]);
         File emptyDir = new File("");
         for (int i = 0; i < files.length; ++i) {
             File file = files[i];
             Object dexFile;
-            if ("N".equals(Build.VERSION.CODENAME)) {
+            if (Build.VERSION.CODENAME.equals("N")
+                    || Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
                 // loadDexFile requires that ret contain all previously added elements.
                 dexFile = Reflect.invokeMethod(clazz, "loadDexFile", file, optimizedDirectory,
                                                mClassLoader, ret);
             } else {
                 dexFile = Reflect.invokeMethod(clazz, "loadDexFile", file, optimizedDirectory);
             }
             ret[curDexElements.length + i] =
                     Reflect.newInstance(entryClazz, emptyDir, false, file, dexFile);
         }
         return ret;
     }
 }