Merge "cosmetic: use _ for unused args" am: 1821351760 am: a50172080b am: fda564250b am: 0afb4effc0

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

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