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