Merge "Export non-apex variants of modules to make" am: f42c21d5

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



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