Merge "Use Android Gradle Plug-in v2.2.0-alpha6" into nyc-support-24.1-dev