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

* commit '2deb74fa285b5693d5326282f2d7aa2b16c8712a':