am aa396b96: Unhide the Android OpenGL ES 2.0 API

Merge commit 'aa396b9610f339cf280159144fbea47506f060e7' into eclair-mr2-plus-aosp

* commit 'aa396b9610f339cf280159144fbea47506f060e7':
  Unhide the Android OpenGL ES 2.0 API