Fix libgui warnings am: 6c5a17dd26
am: 972cce4cb9

Change-Id: I83e31cd57286bb8fc5a25f7a1f6d895176640a84