Switched to main osmdroid codebase