revert gpu/ion changes

Change-Id: I944871caf16429c0cda68fa973639795a71ab8d5