Merge "Move to Gradle 1.7" am: cbb9f117f7 am: 607b50bd49 am: d7c4eb8534 am: eb479b522f am: dcdd7c5bd7 am: 2deb74fa28
am: 7c4435e341

* commit '7c4435e341b933b6c8112b110ecb55eb74ff86b6':