Merge "Camera2: Update tonemap curve definitions." into klp-dev