Merge "Fix misc-macro-parentheses warnings."
am: d2cf3bda69

* commit 'd2cf3bda69b1286b6d2736a4e66a7e8b9cacc153':
  Fix misc-macro-parentheses warnings.

Change-Id: I42e8a186d9f165135f4185e25be4f55506631420