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

* commit 'dcdd7c5bd7fe083560e2a072ab57cecb53eb1a57':