Merge "Update internal gradle plugin." am: 66c78e3f88 am: cc321c9422 am: 1b7fc2999a am: 11dc318ce2 am: 433b1f85bd
am: 643150e927

* commit '643150e927d081d4e68611211b0c850478e19bee':