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

* commit '556993f4ffce1f4fe961fb85868a391a960cebb6':
  Fix misc-macro-parentheses warnings in libs/gui.

Change-Id: I0f3187bbe31b78fd79ad7e0a9adaada9fd92c179