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

Change-Id: I82fc23560f33cbeaed6c1b501fc378a5d804aaf5