Merge pull request #836 from google/chromeos

Default to building both x86 and ARM ABIs
diff --git a/apps/OboeTester/app/build.gradle b/apps/OboeTester/app/build.gradle
index 9784049..b131b79 100644
--- a/apps/OboeTester/app/build.gradle
+++ b/apps/OboeTester/app/build.gradle
@@ -13,8 +13,7 @@
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++14"
-                // abiFilters "x86", "armeabi-v7a", "arm64-v8a"
-                // abiFilters "arm64-v8a"
+                abiFilters "x86", "x86_64", "armeabi-v7a", "arm64-v8a"
             }
         }
     }
@@ -42,4 +41,4 @@
     implementation 'com.android.support:appcompat-v7:28.0.0'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-}
+}
\ No newline at end of file