am d149516e: am 7e464956: Merge "Move Clang only flags into LOCAL_CLANG_CPPFLAGS."

* commit 'd149516e1a3a63549d2c654b1398544d5de46a3e':