am 26dfd03d: am 384a04d9: Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev

* commit '26dfd03dc7824ef1ca9bea7e033c6b05061779f0':
  Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement