Merge "Fix misc-macro-parentheses warnings." am: d2cf3bda69 am: e3d129de20 am: 323cb09f89
am: 2c9a8e5d52

* commit '2c9a8e5d52d19cd7fa212260c25798b981070d41':
  Fix misc-macro-parentheses warnings.

Change-Id: Ib7b4b5ac5561f8f4f733a22c0419c3538e5a74e0