am cd108d55: Merge "emulator opengl: Small change to support more surface attributes"

* commit 'cd108d55f4b1c7370d8903df957d8014f8957ae5':
  emulator opengl: Small change to support more surface attributes