Cm 11.0

Merge "manta: charging led support" into kk4.4
manta: fixup USB OTG 
fix conflicts with other devices