am 50f6b836: am fa7b48bf: Merge "Regenerate uapi header files."

* commit '50f6b8363e1429316311450f2a3041040977d67c':
  Regenerate uapi header files.