Merge osmdroid

The big merge. /cc @fdansv can you review for merge?