Merge "Fix clang-tidy performance warnings in opengl." am: d101620ef6
am: db596417d3

Change-Id: I3da6e7e21fb7bad59d083d9eaab7e26a226f85fd