Merge "wil6210: add support for abort scan" into msm-4.9