Merge "Fix Dockerfile.aarch64"