am bf667e31: Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev

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