am 1a5bc28f: am a0e4d164: Merge "Declare (and simplify) uid_from_user."

* commit '1a5bc28faed5e2060a6f3e1b8135fe82dc2cb319':
  Declare (and simplify) uid_from_user.