Camera bringup changes system-core

Change-Id: I1cf98641eca9096bd27645e07ea802646ea1fb96

Conflicts:
	include/system/camera.h