Merge "Move to Gradle 1.7" am: cbb9f117f7 am: 607b50bd49
am: d7c4eb8534

* commit 'd7c4eb8534df24d452cf740629c9006218a7d451':