Merge "Add wifilogd to generic image" am: c278a63560
am: bc7a9d2dd4

Change-Id: Idb88e9004f8c123bc484b078f5c6b3e08590b9e1