Merge "Revert "Explicitly include libgui as a shared library in libgui_test."" into main