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

Change-Id: Iece9f1428655c8674cf62a92ecb0a088ad74b629