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

Change-Id: I76f9cae1242e4ac9e06ad146117cd8bab6946c45