Upgrading gradle version and adding fix for SDKs 15 and 16.