[cosmetic] goimports changes (https://github.com/bradfitz/goimports/)