Merge "Declare (and simplify) uid_from_user."