Merge "remove emulator_vendor.mk from aosp_arm64.mk"