Merge "ARM: dts: msm: Fix merge error for coresight devices on SDM845" into msm-4.9