Merge "Revert "Deduplicate APEX variants that would build identically"" am: fc4d79598c am: b1d3c4c4d7 am: 671aed59c9 am: d65caf6abb

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

Change-Id: Iab1b2f2606a4915caf73972283f6a9f539e5ad7c