merge libmm-utility, location-manager