updated to work with new android gradle build 0.12.+
Merge remote-tracking branch 'origin/master' into libz5004.2.2

Conflicts:
	app/build.gradle