Fix merge conflicts after auto merge

.gitignore

indra/cmake/CMakeLists.txt

indra/cmake/FindICU4C.cmake

indra/cmake/ICU4C.cmake

indra/cmake/ViewerMiscLibs.cmake

indra/llcommon/CMakeLists.txt

indra/llcommon/llstring.cpp

indra/llcommon/llstring.h

indra/llrender/CMakeLists.txt

indra/llrender/llfontbitmapcache.cpp

indra/llrender/llfontbitmapcache.h

indra/llrender/llfontfreetype.cpp

indra/llrender/llfontfreetype.h

indra/llrender/llfontfreetypesvg.cpp

indra/llrender/llfontfreetypesvg.h

indra/llrender/llfontgl.cpp

indra/llrender/llfontgl.h

indra/llrender/llfontregistry.cpp

indra/llrender/llfontregistry.h

indra/llui/CMakeLists.txt