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

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