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

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



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