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

* commit '11dc318ce280764486521607152b5e4ce59d3177':