Merge "Fix misc-macro-parentheses warnings in opengl."
am: b09e70ce56

* commit 'b09e70ce56f13c319a2936d47207e0322935059f':
  Fix misc-macro-parentheses warnings in opengl.

Change-Id: I6778f23285bfa0115e0222f03b52ef4f871cc2f7