Merge "libgui: add EGL Image Tracking for debug" into qt-r1-dev am: cd5c497f9d
am: 5783949f65

Change-Id: I4f8f27b18ff3c4c78d6d2d071973841c596ffa37