Merge "Update internal gradle plugin."
am: 66c78e3f88

* commit '66c78e3f8866b0d555539aeafdd10843f7e814e2':
  Update internal gradle plugin.