Merge "Shellcheck warnings addressed" am: 523ce07e5c

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

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