shixiong/okd @ af009a7a51d7b6f5799a14c452cc7db92727135e

Kenny Woodson 4b85e4fae0 Support for gce		9 роки тому
..
units	4b85e4fae0 Support for gce	9 роки тому
env-setup	2d7624e4f0 unittest for merge_destructively. More to come	10 роки тому