Update for gradle 2.0 and cm plugin 1.19