Update to build with gradle 2.1