[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: 3a2989ae68

Change-Id: I398b71ca7b2184ae8d84373e73cf92da0f7a495b