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

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