Merge "Moved contents of clang_cflags into cflags" am: 5cf209cd am:...

Merge "Moved contents of clang_cflags into cflags" am: 5cf209cd am: b7d77587 am: 76311212 am: 4c7f5901

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2096938



Change-Id: Iffd2cdd8d3510dd8500a5ade39b63bdd6f78823d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>