Added missing MR0_CAMERA_BLOB ifdef

Conflicts:
	include/gui/SurfaceComposerClient.h

	modified:   include/gui/SurfaceComposerClient.h
merged in ICS_CAMERA_BLOB ifdefs from CyanogenMod

Conflicts:
	include/gui/SurfaceComposerClient.h

	modified:   libs/gui/SurfaceComposerClient.cpp