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

Merge "Update locations of apex bzl files" am: a704eb14 am: 1873bb0b am: 38d74297 am: 0e26d9c7

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



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