Merge "qcom: qpnp-smb2: fix cleanup path" into msm-4.9