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

* commit '5cdc14143351539c3eae053fe142578382f254a5':
  Remove the non-uapi kernel headers.