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

Change-Id: I9a57806d864475d0921b66906c40729465f63b6f