Merge "[HWUI] Remove libgui from libhwui's dependency list"