Merge "Simplify build of libhostgraphics" into main