Merge "Revert "Make glob output include product name"" into main am:...

Merge "Revert "Make glob output include product name"" into main am: ff3fcd1f am: 5d23bb7d am: 571db59b am: baf44279

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



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