Merge "Moved contents of clang_cflags into cflags" am: 5cf209cdd9 am: b7d77587b4 am: 7631121229 am: 4c7f590188 am: 794d78d1c4

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

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