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

* commit 'c9ff37144a7943ee1bc247cef3620c8cce22049d':
  fix valgrind ioctl warning.