Merge "wifi: use PLOG rather than LOG strerror." am: fba8a08e6f
am: 6d37b594a8

Change-Id: I1fb920c4f52ce0b41905c60f959ee367bcf5223c