Merge "Update build.gradle to match new DSL." into idea133
 Auto-merge: b4c4527

* commit 'b4c45275388ee38c0dafbc819375a1c95e632415':
  Update build.gradle to match new DSL.