Merge "msm: msm_bus: Revert the name change for backward compatibility"