Merge "Avoid crashing on bad architecture value." into main am: d1067b3f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2837078



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