Merge "Add aio_compat to hikey"