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

Change-Id: Ic82055c282d0d01900a8bc92394fe2f9e0b6f212