am 6f7f1caa: am 48082a0a: Merge "Remove declarations related to cuserid(3)."

* commit '6f7f1caa1dc14c3f8b522653d20aa5075b7203f2':
  Remove declarations related to cuserid(3).