Merge "Reverted to Gradle 1.6 due to RMI problem when importing projects."