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

Change-Id: Id061b337c25660f111488c33431f61d3b16ec825