am 85cac2ab: am b1dd4af7: Merge "Fix a typo in ioctl usage message."

* commit '85cac2abd416120646b0fe058aac812ca517d71b':
  Fix a typo in ioctl usage message.