Merge "Include to define uid_t." into jb-mr1-dev