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

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

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