Merge "Move to using android gradle plugin 2.2.4" into nyc-support-25.2-dev