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

* commit '5abf78e6b849595b2e937563a5570375b2287bd8':
  Fix misc-macro-parentheses warnings in libs/gui.

Change-Id: Ica1eb1e2fcd63b70e470d3d5527c9789a11fbcbe