Moved contents of clang_cflags into cflags am: 0c67863a0d am: ed2151f893 am: 6c275629d2 am: f3dc5fa9ba am: 74be2e91df

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

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