[PATCH v2 0/2] MR3268: Move geolocation into correct dll