Updated to Gradle Android plugin 0.6 and Gradle 1.8

Conflicts:
	android/build.gradle