Merge changes If8a072ea,I8fead050

* changes:
  NDK EGL: Build break fix
  Revert "Revert "Merge changes Icc59b133,I71814ffd,Idfdb90b5,Ie3bded59,Icaa93832, ...""