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

Change-Id: I017f6409acc21705aabb0a5b005009b3385e060d