Revert "Reformat java files."

This reverts commit 54e564c799530b6e9917b8febe2b08b28000d27c.

This commit did aggregate 2 different commits. Reverting to be able to
land those correctly.

TBR=qsr@chromium.org

Review URL: https://codereview.chromium.org/775133002