jf: move camera option to gallery2

Change-Id: I8079e35e753edbbcfd36d3d8a173e831621a5481
Merge "jf: move camera option to gallery2" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into dc43