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

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

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



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