Fix the content_shell.apk in android x86 target build bug

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 4a67c23a1e8b802d195e4f715033a1d240bd4112..965cc9d52934f7f0579ec34cf5179c9b5f0cf216 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -548,7 +548,7 @@
             {
               'action_name': 'copy_and_strip_so',
               'inputs': ['<(SHARED_LIB_DIR)/libcontent_shell_content_view.so'],
-              'outputs': ['<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_content_view.so'],
+              'outputs': ['<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so'],
               'action': [
                 '<!(/bin/echo -n $STRIP)',
                 '--strip-unneeded',  # All symbols not needed for relocation.
@@ -568,7 +568,7 @@
                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_net.jar',
                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_media.jar',
                 '<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar',
-                '<(PRODUCT_DIR)/content_shell/libs/armeabi/libcontent_shell_content_view.so',
+                '<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so',
               ],
               'outputs': [
                 # Awkwardly, we build a Debug APK even when gyp is in
@@ -580,6 +580,7 @@
               'action': [
                 'ant',
                 '-DPRODUCT_DIR=<(PRODUCT_DIR)',
+                '-DAPP_ABI=<(android_app_abi)',
                 '-buildfile',
                 '<(DEPTH)/content/shell/android/content_shell_apk.xml',
               ]