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

* commit '2ae567c82ee34fb7e51e797fce140313de34338b':
  Declare (and simplify) uid_from_user.