Merge "Fix misc-macro-parentheses warnings in libs/gui." am: 3f5fc8aa6a am: 5abf78e6b8
am: 3495475bfd

* commit '3495475bfd55f469db9a85475b6b9036dfca9079':
  Fix misc-macro-parentheses warnings in libs/gui.

Change-Id: Ib39778e0fd6c3389ebdc96eed914b531c7faf59f