Android build fix
Merge branch 'develop_SpriteBuilder' into develop