Add wificond to generic images
am: 9c98383ed8

Change-Id: Iabc79b35483af3de5dbe2a04ec44f6cf2ef59eec