am 81ddd143: Merge "Remove the non-uapi kernel headers."

* commit '81ddd14381b09f171c006ebcbba15b3c1baf2a9f':
  Remove the non-uapi kernel headers.