Small fixes in android generator.