am 59644a6c: Merge "Fix nandread to build with old or uapi headers."

* commit '59644a6c7182db6caf53dc61f448f2c68ff569be':
  Fix nandread to build with old or uapi headers.