Merge "Deleted clang property in Android.bp files" am: 6f979417ec am: 8274b1299b

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

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