Fixed Derp

Change-Id: I4619d4077a5c43658a33ae930e799f7fc019bfd0

Conflicts:
	services/camera/libcameraservice/CameraService.cpp