Update builder to latest (new) command line tools

Update to latest version of tools, plus necessary adjustments for Google's fiddling.