Android template project builds successfully. Include paths simplifications (more comfortable to use).
Merge branch 'development_android_templae_fix' into development