Update build/all_android.gyp from downstream.

build/all_android.gyp

Index: build/all_android.gyp
diff --git a/build/all_android.gyp b/build/all_android.gyp
index 9cae82b9cec05905ae1edfe5e1d88f138d41e3a4..c3b103a292724f7f88b37d07fa93bbfd5317a59a 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -7,12 +7,18 @@
 # into all.gyp.
 
 {
+  'variables': {
+    # A hook that can be overridden in other repositories to add additional
+    # compilation targets to 'All'
+    'android_app_targets%': [],
+  },
   'targets': [
     {
       'target_name': 'All',
       'type': 'none',
       'dependencies': [
         '../content/content.gyp:content_shell_apk',
+        '<@(android_app_targets)',
         'android_builder_tests',
       ],
     }, # target_name: All
@@ -28,12 +34,14 @@
       'target_name': 'android_builder_tests',
       'type': 'none',
       'dependencies': [
+        '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests',
         '../base/base.gyp:base_unittests',
         '../chrome/chrome.gyp:unit_tests',
         '../content/content.gyp:content_shell_test_apk',
         '../content/content.gyp:content_unittests',
         '../gpu/gpu.gyp:gpu_unittests',
         '../ipc/ipc.gyp:ipc_tests',
+        '../media/media.gyp:media_unittests',
         '../net/net.gyp:net_unittests',
         '../sql/sql.gyp:sql_unittests',
         '../sync/sync.gyp:sync_unit_tests',
@@ -45,7 +53,6 @@
         '../ui/ui.gyp:ui_unittests',
         # From here down: not added to run_tests.py yet.
         '../jingle/jingle.gyp:jingle_unittests',
-        '../media/media.gyp:media_unittests',
         # Required by ui_unittests.
         # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but
         # this would cause circular gyp dependency which needs refactoring the
@@ -53,6 +60,11 @@
         '../chrome/chrome_resources.gyp:packed_resources',
       ],
       'conditions': [
+        ['linux_breakpad==1', {
+          'dependencies': [
+            '../breakpad/breakpad.gyp:breakpad_unittests',
+          ],
+        }],
         ['"<(gtest_target_type)"=="shared_library"', {
           'dependencies': [
             # The first item is simply the template.  We add as a dep
@@ -62,8 +74,8 @@
             '../testing/android/native_test.gyp:native_test_apk',
             # Unit test bundles packaged as an apk.
             '../base/base.gyp:base_unittests_apk',
-            '../content/content.gyp:content_unittests_apk',
             '../chrome/chrome.gyp:unit_tests_apk',
+            '../content/content.gyp:content_unittests_apk',
             '../gpu/gpu.gyp:gpu_unittests_apk',
             '../ipc/ipc.gyp:ipc_tests_apk',
             '../media/media.gyp:media_unittests_apk',