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

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