Merge "libgui is private VNDK"