[[ Bug 13800 ]] Fixes for few errors generated with the new Android SDK
Merge pull request #1370 from runrevsebastien/bugfix-13800

[[ Bug 13800 ]] Fixes for few errors generated with the new Android SDK