Camera: Fix the removal of histogram setting fix

Regroup conditionals to fix the NPE.

Change-Id: If87e5287b75a8f43c1a34f234aa0a8c405f43891
Merge branch 'cm-11.0' into kk_mkt