Merge "Fix eglSurfaceAttrib return value" into nyc-dev am: f2b1a15
am: f52cb2e

* commit 'f52cb2ee0c27646110ccd81cefcd6b03bde87ad6':
  Fix eglSurfaceAttrib return value