Merge "Revert "Qualify prebuilt_etc apex module name by relative paths"" into main am: 3ef813bdf2

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

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