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

Change-Id: Ic10a654f49192c81092e2e38a7e087917750cd94