Update templates for Android
Update Android JSON config files and project creation script
Merge pull request #3376 from folecr/android_redesign_update_template

Update templates to match newer, mostly-NDK Android port