Merge "EHCI: HSIC: Prevent disabling wakeup irq twice" into msm-3.4