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

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