am 218c0899: am 794db6cb: Merge "GFX api cleanup 1.5 of 2" into jb-dev

* commit '218c0899bdea2395f1fe56e1eecc108b633e0da6':
  GFX api cleanup 1.5 of 2