Update from chromium https://crrev.com/302282

build/all.gyp

Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index c58abf63c1244b4babe3a8f8d79fd76b0b3bd1df..d130abe946b50e6e0933c974bed39c3690ebef0c 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -316,7 +316,6 @@
             '../chrome/chrome.gyp:browser_tests',
             '../chrome/chrome.gyp:chromedriver_tests',
             '../chrome/chrome.gyp:chromedriver_unittests',
-            '../chrome/chrome.gyp:interactive_ui_tests',
             '../cloud_print/cloud_print.gyp:cloud_print_unittests',
             '../content/content_shell_and_tests.gyp:content_browsertests',
             '../content/content_shell_and_tests.gyp:content_shell',
@@ -344,7 +343,8 @@
           ],
           'conditions': [
             ['use_athena!=1', {
-              'dependencies' : [ 
+              'dependencies' : [
+                '../chrome/chrome.gyp:interactive_ui_tests',
                 '../chrome/chrome.gyp:sync_integration_tests',
                 '../chrome/chrome.gyp:unit_tests',
                ],
@@ -777,7 +777,7 @@
             '../android_webview/android_webview.gyp:android_webview_unittests',
             '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests',
             '../base/base.gyp:base_unittests',
-            '../breakpad/breakpad.gyp:breakpad_unittests_stripped',
+            '../breakpad/breakpad.gyp:breakpad_unittests_deps',
             # Also compile the tools needed to deal with minidumps, they are
             # needed to run minidump tests upstream.
             '../breakpad/breakpad.gyp:dump_syms#host',
@@ -802,7 +802,7 @@
             '../media/media.gyp:media_perftests_apk',
             '../media/media.gyp:media_unittests',
             '../net/net.gyp:net_unittests',
-            '../sandbox/sandbox.gyp:sandbox_linux_unittests_stripped',
+            '../sandbox/sandbox.gyp:sandbox_linux_unittests_deps',
             '../sql/sql.gyp:sql_unittests',
             '../sync/sync.gyp:sync_unit_tests',
             '../testing/android/junit/junit_test.gyp:junit_unit_tests',
@@ -1179,9 +1179,7 @@
               'type': 'none',
               'dependencies': [
                 '../base/base.gyp:base_unittests',
-                # TODO(jackhou): Ensure that app_installer builds on trybots
-                # and waterfall, then de-comment here.
-                #'../chrome/chrome.gyp:app_installer',
+                '../chrome/chrome.gyp:app_installer',
                 '../chrome/chrome.gyp:browser_tests',
                 '../chrome/chrome.gyp:sync_integration_tests',
                 '../chrome/chrome.gyp:crash_service',