Merge \"Use Android Gradle Plug-in v2.2.0-alpha6\" into nyc-support-24.1-dev
am: 3a47da51f9

Change-Id: I97dd339bba097e0dd75affa80b2f92cd9b678a9d