Merge 10.5.A.0.230
Merge remote-tracking branch 'daeiron/cm-11.0' into burningcat3

Conflicts:
	drivers/usb/host/ehci-msm-hsic.c