Small changes due to Android  Studio 1.0 and gradle 1.0.0