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: Ie8b712f1c1a72a2b79ae50d9721a545bf330d7f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>