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

Change-Id: I0c62f776c5e3a3e483bdc56876f8479615ba6269