Merge "Deduplicate APEX variants that would build identically" am: ca29a25d38

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

Change-Id: Ic3727a541bb7a098fe81ca0d4cf92e2139f1a7ab