Merge "Put the emulator_x86_arm board back" into main am: f8a21bb9

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



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