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

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