Bring in latest changes from `react-native-maps`

[aardvarkk]

I ran into a problem building react-native-maps-osmdroid due to the an issue that was fixed in react-native-maps with this PR. I thought I'd do a merge commit that brought in the latest changes and fixes. I'm not sure if there are tests suites or anything that need to be run, but this was a first cut at a merge commit to reconcile the two and bring in any new changes.