Merge "USB: Trival cleanup in MSM drivers" into msm-3.0