Merge "Cleanup in emulator_arm64/device.mk" am: aa1f9707 am: 40e233c6 am:...

Merge "Cleanup in emulator_arm64/device.mk" am: aa1f9707 am: 40e233c6 am: 8c82f8e5 am: b645272f

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



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