Make clang_load and clang_add_plugin independent.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 6d530445bd8cd78ab0cc4b7e338002d3aa0d70c0..7acfdefac9f736c2e50d19dcbdedcb29f3a807c6 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1919,9 +1919,13 @@
               '<(clang_chrome_plugins_flags)',
             ],
           }],
-          ['clang==1 and clang_load!="" and clang_add_plugin!=""', {
+          ['clang==1 and clang_load!=""', {
             'cflags': [
               '-Xclang', '-load', '-Xclang', '<(clang_load)',
+            ],
+          }],
+          ['clang==1 and clang_add_plugin!=""', {
+            'cflags': [
               '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)',
             ],
           }],
@@ -2269,9 +2273,13 @@
                 '<(clang_chrome_plugins_flags)',
               ],
             }],
-            ['clang==1 and clang_load!="" and clang_add_plugin!=""', {
+            ['clang==1 and clang_load!=""', {
               'OTHER_CFLAGS': [
                 '-Xclang', '-load', '-Xclang', '<(clang_load)',
+              ],
+            }],
+            ['clang==1 and clang_add_plugin!=""', {
+              'OTHER_CFLAGS': [
                 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)',
               ],
             }],