Merge "Remove aio_compat" into pi-dev