[automerger skipped] Merge "Camera: update tonemap curve images" into pi-dev am: ba88c2e9bc
am: fef7d7c61d  -s ours

Change-Id: I6c0ff784ae4bf1b2fbb1c80433238be86477749f