Changes to support new build tools and Retrofit 2.0