Merge "Remove references to device/generic/goldfish/arm32-vendor.mk" am:...

Merge "Remove references to device/generic/goldfish/arm32-vendor.mk" am: 2a273f50 am: 845fd94a am: f33dd70b

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



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