[automerger skipped] DO NOT MERGE Push libwifi-hal.so and libwifi-system.so am: e330a833b1 -s ours am: 653513eb16 am: c2d70c68d1
am: 4d7e560399 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic32c1b20cb0b7ed1aa8858abdad73fbf3600140e