Updating build.gradle to be consistent with android studio's default build.gradle