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

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