omap4-common: sync camera with p-jb-mr1-release from omapzoom

Change-Id: I9541d7a62b9fb4cdd2e95676d1ab8ca0761cabe9