Merge "msm: mpq8064: Correct VCAP stride calucation"