Merge "Moved contents of clang_cflags into cflags" am: edc8ebe82b am: d8423b9c58 am: 463426410d

Original change: https://android-review.googlesource.com/c/platform/external/llvm/+/2070533

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