Merge "msm: clock: Use device names to distinguish between USB clocks" into msm-3.0