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

Change-Id: I021b4bdceadd61eac58e8f6362fa057279f75cf0