Merge "Fix misc-macro-parentheses warnings in goldfish/opengl."