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

Change-Id: If69ad5b4bb1969d6517c4183024f72354ff0f9ff