Merge "Remove redundant clang cppflags"
am: 8bbed5a635

* commit '8bbed5a6350a2a7ca1eb7d0886b783fa5b681180':
  Remove redundant clang cppflags

Change-Id: Ic45e02c74ec154bc74b42dd12df2c162b4a862ce