am 0916b463: am 48250c27: Merge "GFX api cleanup 1 of 2" into jb-dev

* commit '0916b463598a99400840c5d55a443bee2446b626':
  GFX api cleanup 1 of 2