Merge "msm: msm_bus: Correct the number of slave ports in the system" into msm-3.0