Merge \\"Fix misc-macro-parentheses warnings in goldfish/opengl.\\" am: 0f478a9c1e
am: d47aedfaa4

Change-Id: I26323a5b5816df6f060ff869d8943cc2404d75c4