GFX api cleanup 1 of 2

Change-Id: Ib85784c18b1647e51f1d7cf2a4c956d17e1d2e3c
6 files changed