Merge "Add wificond to hikey image"