Merge "USB: android: Handle error conditions in init() function" into msm-3.0