CB-8143 Use gradle 2.2.1 instead of 1.12 to appease Android Studio 1.0 warning-on-startup
Merge branch 'master' into 4.0.x (gradle version bump)