Fixing build issue on Simulators
Merge branch 'master' of https://github.com/rhomobile/rhodes