Merge "Move to Gradle 1.7"
am: cbb9f117f7

* commit 'cbb9f117f79e5ada0c2c8fc4b7a5cc56af88c4bc':
  Move to Gradle 1.7