Fix libgui warnings
am: 6c5a17dd26

Change-Id: I463a190d7830dbdc5817c753f57fa9b5cdecd404