update our build system to support the experimental L-Release NDK

platform_tools/android/gyp/skia_android.gypi

Index: platform_tools/android/gyp/skia_android.gypi
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi
index 624b599bd6770687655c851fb4adb2f974161360..210a61a13f758d968aa3e42ad15355e06893b669 100644
--- a/platform_tools/android/gyp/skia_android.gypi
+++ b/platform_tools/android/gyp/skia_android.gypi
@@ -9,16 +9,26 @@
       ],
       'variables': {
         'conditions': [
-          [ 'skia_arch_type == "x86"', {
+          [ 'skia_arch_type == "arm" and arm_version != 7', {
+            'android_arch%': "armeabi",
+          }],
+          [ 'skia_arch_type == "arm" and arm_version == 7', {
+            'android_arch%': "armeabi-v7a",
+          }],
+          [ 'skia_arch_type == "arm64"', {
+            'android_arch%': "arm64-v8a",
+          }],
+          [ 'skia_arch_type == "x86" and skia_arch_width == 32', {
             'android_arch%': "x86",
-          }, {
-            'conditions': [
-              [ 'arm_version == 7', {
-                'android_arch%': "armeabi-v7a",
-              }, {
-               'android_arch%': "armeabi",
-              }],
-            ],
+          }],
+          [ 'skia_arch_type == "x86" and skia_arch_width == 64', {
+            'android_arch%': "x86_64",
+          }],
+          [ 'skia_arch_type == "mips" and skia_arch_width == 32', {
+            'android_arch%': "mips",
+          }],
+          [ 'skia_arch_type == "mips" and skia_arch_width == 64', {
+            'android_arch%': "mips64",
           }],
         ],
       },