msm8660: Fix mismerges
Rename camerawrapper directory to camera

To be consistent with CM.