Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Format Java files with google-java-format
  Add missing newline at end of tools/BUILD
  Format Java files with google-java-format
  Update external dependencies
  Revert "Remove Tika dependency for uploadvalidator"
  Add test for mime type detection

Change-Id: Id90681262fb209c2d4aee376f100f6e1914379de