Fix libgui warnings am: 6c5a17dd26 am: 972cce4cb9
am: af06c61e1b

Change-Id: I191c8a14d54427215922427c4bb497bdb7c27dd9