Merge changes I727a2ca6,Ic3918978

* changes:
  GLES NDK: Build break fix
  Revert "Revert "Merge changes If65b4e6c,If993b7f7""