devices-8960: Fix camera failure with newer tz firmware

Change-Id: I524ff7196d9f3ae268178826b986d5dcee1de88f

Conflicts:
	arch/arm/configs/cyanogen_d2cri_defconfig