Merge "add gps gid to system_server" into mnc-dev