Merge "Don\'t apply clang flag to gcc builds." am: d9a1b35df6 am: a41288b88f
am: e0bcc4efe9

* commit 'e0bcc4efe96f196104e6de681b28de295d70fb84':
  Don't apply clang flag to gcc builds.