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

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

Change-Id: I5f42f292247599f4f374ecdba31fdb72088de3ad