Merge "Remove the non-uapi kernel headers."