Merge "Handle arch/cpu variants in mixed builds" am: 9b0af33c am: 2c66f0f3...

Merge "Handle arch/cpu variants in mixed builds" am: 9b0af33c am: 2c66f0f3 am: 998cacfb am: 0f307274

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

Change-Id: I6008bdbcb1f9f2d3cc7b9f032d7b4967a52d70f4