am 1d421490: Merge "Include to define uid_t." into jb-mr1-dev

* commit '1d4214900cc5c07eceb3a98618fcfecdfa8dc903':
  Include to define uid_t.