[automerger skipped] DO NOT MERGE Push libwifi-hal.so and libwifi-system.so
am: e330a833b1 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib633b303052c401ea2dab7b5b6148ec634cf31fc