Merge "Deduplicate APEX variants that would build identically" am: ca29a25d38 am: aa3235edcc am: 1f160e818b am: a485326840

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

Change-Id: Icddcd5853e1699247dea10822faae2f4b40f8c75