Solved a problem when building against gradle 2.1