am 7156645c: am 2ed09ea4: Merge "GFX api cleanup 2 of 2" into jb-dev

* commit '7156645c58d1489b87cf9ecf00cbb4d073d12534':
  GFX api cleanup 2 of 2