Merge "Move to using 2.2.3 of Android Gradle plugin." into nyc-support-25.2-dev