Merge "Update to gradle 2.5" into studio-1.3-dev
automerge: b65d578

* commit 'b65d57816a7b12930ad99212bf3fb3828c76cd9a':
  Update to gradle 2.5