Camera: Fix removal of histogram setting

Histogram is disabled by default in config.xml, so the code to filter unsupported modes is never executed
Remove histogram option completely when it's disabled in config.xml

Change-Id: Id47da14d7d3d268e70727d25ed8f4d431b80f6f1
Camera: Fix JPEG quality DB update

Change-Id: I4e43152d8a4a8ed689de086757bcabc17749f9c8
Camera: Fix the removal of histogram setting fix

Regroup conditionals to fix the NPE.

Change-Id: If87e5287b75a8f43c1a34f234aa0a8c405f43891
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0