More updates from Paul

Change-Id: I6abec7c91b15d4c9cd9916c878230403a4e1f89f

Conflicts:
	camera/exynos_camera.c