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

* commit '36ff3bd273d9f60822104eb53f3aa1886160b360':
  Fix nandread to build with old or uapi headers.