Revert "superior: clean up and fix egl"

This reverts commit b4a14460dce30ebfc3dd4ca9322343b2f83e17b3.

Change-Id: I472e3b19a375d0d40e041c429a98ac271595634d