Fixed error getting while building android app using ant
Merge branch 'feature/refactor' into develop