Updated to latest Android Gradle Plugin

* Fixed issues with Gson repackage task