Revert 66265 - Remove -no-integrated-as flag for Clang/Linux builder.

BUG=61931
TEST=still builds

Review URL: http://codereview.chromium.org/4976002

TBR=hans@chromium.org
Review URL: http://codereview.chromium.org/5216006

git-svn-id: http://src.chromium.org/svn/trunk/src/build@66932 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

common.gypi

@@ -1168,6 +1168,9 @@
               # http://code.google.com/p/googletest/source/detail?r=446 .
               # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ).
               '-Wno-unnamed-type-template-args',
+              # The integrated assembler chokes on one ffmpeg file.
+              # http://crbug.com/61931
+              '-no-integrated-as',
             ],
             'cflags!': [
               # Clang doesn't seem to know know this flag.