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

* commit '68a4187c4a88a885b36412607797e7ca65662968':
  Regenerate uapi header files.