Merge in head from google/anvil-build.