Swap in yapf formatted tree builder from upstream