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

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

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