clean camera workaround

Conflicts:
	common.mk

Change-Id: I6bafc54998ec49000b3a11b0c79f9d6b2a77452e