am b02ca27f: am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbread

* commit 'b02ca27f05a47fad75c57d6d8c52ccc5b21a8043':
  Refresh EGL header to work with the NDK