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

* commit 'eb479b522f934aceca0b2d06cb1a9c0b711ff26d':