Merge "Add null egl/gles stub support"