Merge "Update gradle version to 2.4-20150224230024+0000"