Merge "arm: mach-types: Add machine IDs for MSM8627 targets" into msm-3.0