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

Change-Id: I93f0fca53e380f0272ef10c4d38ea0033cef7cc4