Merge "msm: Rename MSMZINC to APQ8084"