Merge "Change bp2build to reflect arm_isa refactor" am: 73501394 am: aeca025f

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



Change-Id: I4da911adbf4ee76dc13ad5b1624d61ea487d63b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>