am 831c7139: Merge "Camera: Add HDR scene mode constants." into jb-mr1-dev

* commit '831c7139c9c697fa9d537979f35dad6bf414202c':
  Camera: Add HDR scene mode constants.