Revert back to old camerawrapper

Change-Id: Ia656a518555600ee618d4b5859bbebd179740ead