Update build.gradle from master

Change-Id: I858554625d69dbc34f7174a5c8526d602113b569
1 file changed