Merge "Fix misc-macro-parentheses warnings." am: 0c0f9228cf am: 4ff367a593
am: 5dc0aa6e41

* commit '5dc0aa6e41fbd961ecefaa3fc6fe4ac720e53bc3':
  Fix misc-macro-parentheses warnings.

Change-Id: I2acf395df99305784d1ada44897b1df26e0f5791