Fixes for Android Eclipse template files
Merge pull request #1568 from seanpaultaylor/next

Fixes for Android Eclipse template files