Undo merge branch 'upstream/mapsforge-mapview' (reverted from commit 843483d49eeaa84f4043d7a497d58aa71b1f134f)