Wait/reap build container before removing it

Fixes: https://github.com/GoogleCloudPlatform/kubernetes/issues/1853
Merge pull request #2780 from zmerlynn/issue.1853

Wait/reap build container before removing it