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

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

Change-Id: I015e6afd10cd5359b8c03596cde41a665f46165a