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

Change-Id: Icb40657285dcf90e5de68a7fbdc4b567106ee806