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

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

Change-Id: I478632b9da6b1eec9b21df1e1d1d3b818118cbba