am d5dceea5: (-s ours) am 9079207a: am dfd082b9: Merge "Native/opengl: Remove unused variables from test" * commit 'd5dceea5':