GFX api cleanup 1.5 of 2

Change-Id: Ib31332ae0b7a6059d4971ea616089cd382ef6895
4 files changed