Fixes to Android templates
Merge pull request #579 from 7sharp9/androidfixes

Fixes to Android templates