Merge "Add libtonemap library"