Merge "cosmetic: name receiver consistently see go/go-style/decisions#receiver-names" am: 6c898fbb6e

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

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