Merge "Export header libraries to eliminate include_dirs elsewhere" into tm-dev