Merge "Import gradle 2.4 -all and remove -bin version"