Merge "Define a narrower context for getting arch props" am: 374623f91f

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

Change-Id: Ie1c4f982f54d70f2c40ac3d7d48f0e28fd42dc05