Merge "msm: audio: qdsp5: Fix for logical errors in qdsp5" into msm-3.0