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

Change-Id: I43f52d41132f6907bb900d39822c89ab5f74b314