Add camera wrapper - should make no difference currently

Change-Id: I231a9b5bb941cf1d2b736f32b263c7497feecbb0