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

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



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