Fix the content_shell.apk in android x86 target build bug

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 47e937d214532028a7c5fed7531dc84f2f908214..1621a0801425eb494f3282c5550e6d85d77470a2 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -827,6 +827,13 @@
             'conditions': [
               ['target_arch == "ia32"', {
                 'target_arch': 'x86',
+                'android_app_abi%': 'x86',
+              }],
+              ['target_arch=="arm" and armv7==0', {
+                'android_app_abi%': 'armeabi',
+              }],
+              ['target_arch=="arm" and armv7==1', {
+                'android_app_abi%': 'armeabi-v7a',
               }],
             ],
 
@@ -837,11 +844,13 @@
           'android_ndk_root%': '<(android_ndk_root)',
           'android_ndk_sysroot': '<(android_ndk_root)/platforms/android-9/arch-<(target_arch)',
           'android_build_type%': '<(android_build_type)',
+          'android_app_abi%': '<(android_app_abi)',
         },
         'android_ndk_root%': '<(android_ndk_root)',
         'android_ndk_sysroot': '<(android_ndk_sysroot)',
         'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
         'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib',
+        'android_app_abi%': '<(android_app_abi)',
 
         # Uses Android's crash report system
         'linux_breakpad%': 0,