Camera wrapper update

Change-Id: I7bf11d68b28cf8f16324ae44edce554d03b74e60

Conflicts:
	BoardConfig.mk
	camera/CameraWrapper.cpp