Merge "Remove <sys/mtio.h> workaround."
am: 7bdbe0010c

Change-Id: I394fd6e97ed74f56e51216ba557e84b36ee64ac5