Merge "Remove unnecessary variable" am: 98bb2768b9

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

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