Merge "Remove usages of long-form variables" am: b760b469 am: 85f941cf am:...

Merge "Remove usages of long-form variables" am: b760b469 am: 85f941cf am: c091ee15 am: 28afecfd

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



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