Merge "msm: q6dsp6v2: Configure token in APR packet correctly" into msm-3.4