Upgrading google-java-format plus reformatting the code#33

garrettjonesgoogle merged 2 commits into

googleapis:mastergoogleapis/api-common-java:masterfrom

garrettjonesgoogle:mastergarrettjonesgoogle/api-common-java:masterCopy head branch name to clipboard