Merge "Put back gradle 2.2"