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

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