Upstream changes from kr/heroku-buildpack-go