Merge "Work around arm64 host prebuilt differences."