Android build
Merge branch 'master' of ssh://github.com/osmandapp/OsmAnd-core