Merge "Add arm64 docker build for cli"