Moved contents of clang_cflags into cflags am: 0c67863a0d am: ed2151f893

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2070667

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