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

* commit '433b1f85bda071b8682cb9c9020debdf7218ed64':