Merge "Add clean kernel header for uhid." into jb-mr1-dev