Fixes for Android Eclipse template files