Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev

* changes:
  replace eglWaitSyncANDROID by eglWaitSyncKHR
  update EGL headers to most recent
  cleanup EGL extensions strings and entry-points