Merge "Fix nandread to build with old or uapi headers."