init: don't use wrapper for camera service

Change-Id: I1742c262cc6969205ce2db0bfe806d45cfe4c6d5
Merge branch 'cm-11.0' into martincz