am 3356457a: am 9092f8fb: Merge "Use uapi kernel headers."

* commit '3356457a94d3e0754479832ac18cdf202c36cdaf':
  Use uapi kernel headers.