Format Java files with google-java-format 1.6

Change-Id: I2bf24128b4682ceb412cd2469d36030621a99ef4
5 files changed