am 8da6e9c7: am c9ff3714: am 596e9c63: Merge "fix valgrind ioctl warning."

* commit '8da6e9c717ec5c1076dfedc7a37e9cfbe100977e':
  fix valgrind ioctl warning.