Merge "Add google-java-format-diff.py from the public repository." am: feb0dfc050
am: 463624ed53  -s ours

Change-Id: I29f88479a2d6f0bf2288105be23d8468ee93bb30