Merge "Remove Tim & add Frank/team as opengl/graphicsenv OWNERS"