Remove camerawrapper
Merge remote-tracking branch 'upstream/cm-11.0' into carbon-kk