Merge "Moved contents of clang_cflags into cflags" am: 5cf209cdd9

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

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