Update makefiles after merge of Chromium at 275833
This commit was generated by merge_from_chromium.py.
Change-Id: Iad0f8b40d3547d8d6337888a84071a951f8302d6
diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk
index 79fbf62..cc26fe5 100644
--- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk
+++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk
@@ -270,6 +270,7 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -287,6 +288,7 @@
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,-O1 \
-Wl,--as-needed \