Rollback trunk to 3.21.16.2

tools/gyp/v8.gyp

Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index f5d82df810aa4e5394bc245778e3cfc7b0acf262..aa01a842f636b9d5ac680354e40d0d5c6f31a0c9 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -353,8 +353,6 @@
         '../../src/hydrogen-infer-representation.h',
         '../../src/hydrogen-infer-types.cc',
         '../../src/hydrogen-infer-types.h',
-        '../../src/hydrogen-load-elimination.cc',
-        '../../src/hydrogen-load-elimination.h',
         '../../src/hydrogen-mark-deoptimize.cc',
         '../../src/hydrogen-mark-deoptimize.h',
         '../../src/hydrogen-minus-zero.cc',
@@ -857,8 +855,8 @@
         }],
         ['v8_enable_i18n_support==1', {
           'dependencies': [
-            '<(icu_gyp_path):icui18n',
-            '<(icu_gyp_path):icuuc',
+            '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+            '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
           ]
         }, {  # v8_enable_i18n_support==0
           'sources!': [
@@ -868,7 +866,7 @@
         }],
         ['OS=="win" and v8_enable_i18n_support==1', {
           'dependencies': [
-            '<(icu_gyp_path):icudata',
+            '<(DEPTH)/third_party/icu/icu.gyp:icudata',
           ],
         }],
       ],