Format Java files with google-java-format 1.6

Change-Id: Id82bdfed15e0d6e1653a7faa75a1265411bd101f
2 files changed