am 414fd6fc: am 4aaa3935: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"

* commit '414fd6fc7a1023a1ca5843e14e7634dfaf255a54':
  Avoid overwriting EGL14.EGL_NO_SURFACE