hope for camera

Conflicts:
	BoardConfigCommon.mk

Change-Id: I09f60d1ea8bc6451891338a717b3267a4095a424