Merge "Camera: update tonemap curve images" into pi-dev
am: ba88c2e9bc

Change-Id: I0fc4eb43ce0e0070b7206e417f066ae7b4d499c8