Merge "Fix misc-macro-parentheses warnings."
am: 0c0f9228cf

* commit '0c0f9228cf1cd0f39ecb56f643ce7e3b050bb143':
  Fix misc-macro-parentheses warnings.

Change-Id: I9fa6dc832ca4920c1f9f85a4fb85e61cd62fdeb5