[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: I211475ff9c0c69984601bbe1fa760f5d3738d177