am 3fbecf11: Update build.gradle from master

* commit '3fbecf118b05748b5e9f6feae596c30eca64ccc9':
  Update build.gradle from master