Updated tools for v1.0

Some minor changes were required to compile with version 1.0 of the Android gradle plugin.