Merge "qcacmn: Fix compilation error in vdev state machine"