Samsung Krait: move defines for camera around

Change-Id: Iafc47d3b92795de8af3762a3e54cffdff7090638
Merge branch 'cm/cm-10.2'