am 9c0b39c4: am ca00dee2: Merge change I5aa3adcf into eclair

Merge commit '9c0b39c47efade5ee2303a8f8ffbd9cf87c2c841' into eclair-mr2-plus-aosp

* commit '9c0b39c47efade5ee2303a8f8ffbd9cf87c2c841':
  Improve the exception message text by including eglGetError().