Merge "Clean up warnings in EGL."
am: c312141adc

* commit 'c312141adc9a5f00b5d13d0980d132d2a8c6f3c9':
  Clean up warnings in EGL.