Merge "LibGUI remove DEBUG" into oc-dev
am: be597daebd

Change-Id: I65756ce89b4a10d2df403f9f9a4ce2cacdaafda0