Fixing app/build.gradle
Merge remote-tracking branch 'upstream/master'
Pulling latest