Merge "Update internal gradle plugin." am: 66c78e3f88 am: cc321c9422
am: 1b7fc2999a

* commit '1b7fc2999a1608f93fba7cf97c60fda8d5c9a6d5':