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

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



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