Merge "add androidmk cc-related variables to androidmk" am: 78aca807

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2393585



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