Merge "Fix misc-macro-parentheses warnings." am: 64d4f64af0
am: 5405ce02c4

* commit '5405ce02c45b55c0ba12fd3131ae329506e91f94':
  Fix misc-macro-parentheses warnings.

Change-Id: I94cd974549d819d7a43733636ecd4a6e464b76eb