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

Change-Id: I5ec41ce5409e7ebb942c785cf33f3af988831273