GFX api cleanup 2 of 2

Change-Id: Ie928b8ee7d31fcaa26fcad9a2548581bb8395a61
7 files changed