[automerger skipped] DO NOT MERGE Push libwifi-hal.so and libwifi-system.so am: e330a833b1 -s ours
am: 653513eb16

Change-Id: I129dc5ec11b690be9dca9247cab4221335f88b9b