Merge "Moved contents of clang_cflags into cflags" am: 076405b337 am: 08f15a5982 am: d1ce7d47e3

Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2069496

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