Merge "Remove declarations related to cuserid(3)."