merge camera jfactive sources

Change-Id: I36911342be2319340f8fe2cd46466c77aafb9fbf

Conflicts:
	drivers/media/video/msm/server/msm_cam_server.c