Merge "Remove unneeded dependencies from libui and libgui"