Merge "usb: ehci-msm2: replace wakelock with wakeup source" into msm-3.4