`gofmt -s -w` some more things.
`gofmt -s -w` some more things.

This doesn't catch everything, because our automated source transformations
break proper import ordering.

PiperOrigin-RevId: 213070264

ampproject/amppackager,ampproject/amppackager,ampproject/amppackager