Add changes since osmdroid. Fixes #383