Backport removal of Android Geolocation
Add IBM-MODIFICATIONS to geolocation