Merge "Add aio_compat to hikey" am: 290d8e4412 am: fcf30d199e
am: 610d4a2c6f

Change-Id: I9cf0d8528323d55ce0257592620da51cb35a1d85