am 30d90523: Merge changes Id682ab72,I9bb4dbae into eclair-mr2

Merge commit '30d905235074f343ebac6002408ab5c2b360ea14' into eclair-mr2-plus-aosp

* commit '30d905235074f343ebac6002408ab5c2b360ea14':
  Improve error message thrown when eglCreateContext fails.
  Improve error reporting by always returning the public