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

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