camera: fix build, add parameters

* also fix Camerawrapper build

Change-Id: I70f32018ca92a3f9d4f110832e9db5e172f77556
Merge branch 'cm' into HEAD