Merge "hikey: Add support for contexthub hal and neonkey / argonkey sensor hal" am: b9e25d10c0
am: b3f618caa2

Change-Id: I671b11c7935f7d6c57567e438d2a7bb15f954c53