Merge "Reverted to Gradle 1.6 until project import works with Gradle 1.7/1.8"