more camera fixes

Conflicts:
	BoardConfig.mk

Change-Id: I06387542faa0649a0d58dc1c40144c01e54a5b6c