Merge "Remove all ARCH references." am: ab5ab25952

Original change: https://android-review.googlesource.com/c/platform/development/+/2481575

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