Wait on build container before removing it

Fixes: https://github.com/GoogleCloudPlatform/kubernetes/issues/1853