Merge "Add wificond to hikey image" am: 34de2ad72b am: 68a9dbca29 am: 1a8f2a51ab
am: 7f4e330fc8

Change-Id: I374f1a9e635f6ed89be5f9f1f98f4b9cda245f52