Merge "bp2build: Add special arch-variant targets." am: 3bc7a1ba47 am: 1f211a9b88

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

Change-Id: I0508155f97fedaa943d0892a10f06fbcff14cc53