Merge "Add missing changes from ARCH removal." am: 8f87d99d85

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

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