Merge "Remove unused aquery structs" into main am: 697dfada am: 741711db am: c66af655

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



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