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

* commit 'cc321c94228a0435bceb242087624e99ab0028ba':