Rebuild with gradle 2.2