am f989c114: Merge change If007a2fa into eclair

Merge commit 'f989c1140bbc84480498df38abec0fafff04e6ee' into eclair-plus-aosp

* commit 'f989c1140bbc84480498df38abec0fafff04e6ee':
  return proper error code from eglCreateImageKHR