am b70562a6: am 152ef50c: Merge "Use common_clang_cflags"

* commit 'b70562a6bf0b4f9253952e694632cdc97cae0abb':