am 3fd3e2f8: am 152ef50c: Merge "Use common_clang_cflags"

* commit '3fd3e2f8d32b89cc4c75bf51e1b81373fc555cc1':