Remove camerawrapper...it is in msm8600-common