camera wrapper fix

Conflicts:
	BoardConfigCommon.mk

Conflicts:
	BoardConfigCommon.mk
BOARD_WEXT_NO_COMBO_SCAN, whitespace cleanup