Merge "Revert "Revert "Remove direct libgui reference from omx server side""" into qt-dev am: e313cff42d
am: 46e187e34e

Change-Id: If021f227682ac45c34a261615c5fff8d56071aa8