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

* commit '607b50bd4954dc1cb216364592e8de5f069590f5':