Merge "ARM: Kconfig: Reintroduce CONFIG_SPECTRA_CAMERA" into msm-4.8