Merge "Update build.gradle to match new DSL." into idea133