Merge "ARM: dts: msm: Change eMMC slave id for sdm670 bus voting"