Merge "[HWUI] clean up libgui include directives"