Merge pull request #20158 from cpuguy83/carry_19504

Dockerfile,contrib,hack: remove buildpack-deps