Fix #396 - Improvement of android geocoder workarounds.