Merge "Rename some variables in definitions.mk" into main am: 26acac72 am:...

Merge "Rename some variables in definitions.mk" into main am: 26acac72 am: 175b8f24 am: b5cdceb2 am: 4f8cd8cd

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



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