Add pak file support for content shell and android apks.

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 4f202e8673dcd0f9838c434e7036ce3a8c7329a6..90d6a7f3b25fbe7ef84a7026fbc9718ecc421bc3 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -533,6 +533,10 @@
             'shell/android/shell_view.cc',
             'shell/android/shell_view.h',
           ],
+          'sources!': [
+            'shell/shell_main.cc',
+            'shell/shell_main.h',
+          ],
           'conditions': [
             ['android_build_type==1', {
               'ldflags': [
@@ -578,7 +582,7 @@
                 '--strip-unneeded',  # All symbols not needed for relocation.
                 '<@(_inputs)',
                 '-o',
-                '<@(_outputs)' 
+                '<@(_outputs)'
               ],
             },
             {
@@ -592,6 +596,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/assets/content_shell.pak',
                 '<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so',
               ],
               'outputs': [