updated build.gradle file for new buildToolsVersion 19.0.1 which might have new fixes.
Merged conflicts with master branch for gradle-wrapper.properties