am b690c9a2: am c7bdd50c: Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev

* commit 'b690c9a2210f020341ba68dd947b4e2ff43e007d':
  Unhide android.opengl.GLES30 class and contents