Automatic merge from submit-queue

Stick to 2.2.1 etcd

Fixes #32253. See https://github.com/kubernetes/kubernetes/issues/32253#issuecomment-245974746. We are sticking with etcd 2.2.1 until we have a recommended rollforward/rollback process for etcd.

See https://github.com/kubernetes/kubernetes/issues/32253#issuecomment-245735209 for etcd roadmap.

I guess I also need to build the image like https://github.com/kubernetes/kubernetes/issues/32253#issuecomment-245744295, and update build/build-image/cross/VERSION?

@lavalamp @timothysc