Merge "Add wifilogd to generic image"