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

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



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