Merge "Fix baseline for arm64."