Merge "Fix PATH setup for arm64."