Merge "[RenderEngine] Strip GLES implementation off Image and Surface."