am 696c75c1: am 829ae5be: Merge "Remove a pre-uapi hack from nandread."

* commit '696c75c165bbefd588b411103036b1193958ef6b':
  Remove a pre-uapi hack from nandread.