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

Change-Id: Ia4911b527240c58fbb554261da1906467a16be3f