Merge pull request #352 from Icenium/include-armeabi-dir

CB-12291: (android) Add x86_64, arm64 and armeabi architecture flavors

bin/templates/project/build.gradle

@@ -187,21 +187,34 @@ android {
         flavorDimensions "default"
 
         productFlavors {
+            armeabi {
+                versionCode defaultConfig.versionCode*10 + 1
+                ndk {
+                    abiFilters = ["armeabi"]
+                }
+            }
             armv7 {
                 versionCode defaultConfig.versionCode*10 + 2
                 ndk {
-                    abiFilters "armeabi-v7a", ""
+                    abiFilters = ["armeabi-v7a"]
+                }
+            }
+            arm64 {
+                versionCode defaultConfig.versionCode*10 + 3
+                ndk {
+                    abiFilters = ["arm64-v8a"]
                 }
             }
             x86 {
                 versionCode defaultConfig.versionCode*10 + 4
                 ndk {
-                    abiFilters "x86", ""
+                    abiFilters = ["x86"]
                 }
             }
-            all {
+            x86_64 {
+                versionCode defaultConfig.versionCode*10 + 5
                 ndk {
-                    abiFilters "all", ""
+                    abiFilters = ["x86_64"]
                 }
             }
         }