Update gradle wrapper to 2.2.1
Add some more debug info to start adding flavor support