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

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

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