am fa7b48bf: Merge "Regenerate uapi header files."

* commit 'fa7b48bf8753690bd15706a1fe3d23cf5c42782f':
  Regenerate uapi header files.