Merge "Link in libtonemap into composer VTS"