Moved contents of clang_cflags into cflags am: 0c67863a0d

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

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