am c8348cc6: Merge "Update Gradle build"

* commit 'c8348cc6b2f780f63ba193fc6af4fc875fec0fe3':
  Update Gradle build