am 1ba6c2f2: Merge "Update tool versions in build.gradle."

* commit '1ba6c2f2ba8fec62d6e5fc0fb20025f2c82bd728':
  Update tool versions in build.gradle.