CB-5977: Removing the Android Geolocation Code.  Mission Accomplished.