Merge "Allow creation of Dockerfile.aarch64 through patch"