Merge "Tweak libtonemap's CPU interface to support batching." into tm-dev