android build: upgraded gradle version + minor adaptations