[automerger skipped] Merge "Fix leaks in wifi_chip.cpp." am: 102e02fbae
am: ef27427cd3 -s ours
am skip reason: change_id I827d3a414761bb836d5360221296823fcb34cd6b with SHA1 a568e530b6 is in history

Change-Id: I111632930ee85e7d7c991872369e7227cf7c0fb0