Primarily to bring in fix for "Clear Architecture field in platform constraint for arm architectures". Signed-off-by: Andrew Hsu <andrewhsu@docker.com> (cherry picked from commit ef027b6d72) Signed-off-by: Victor Vieux <victorvieux@gmail.com>
ef027b6d72