Merge "Add libtonemap headers" into tm-dev