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

Change-Id: I358684923104803e00d1910e4404a3f48c01f3fc