Fix compilation in CyanogenMod tree
Enable BQ24196_OTG_MODE
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1