Merge "msm: board-8064: Remove RIVA device for MPQ targets" into msm-3.4