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

Change-Id: I483a457782a441e5b59f7b0b08e7a4cdf4f12949