Merge "Update locations of apex bzl files" am: a704eb14 am: 1873bb0b

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



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