More fixes

Change-Id: I46bd767b13ae89d71548dc96da3b0c1880a38710

Conflicts:

	camera/exynos_camera.c