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

* commit '8d98440430cdf02cdd27bf2a32fb6ed7e3a9f2bc':
  Fix misc-macro-parentheses warnings.

Change-Id: Id0cbc0b8828955abbf76919a1c99af6862440289