camera wrapper fix

Conflicts:
	BoardConfigCommon.mk