Merge "Fix misc-macro-parentheses warnings."
am: 7c05a8e156

* commit '7c05a8e1561b36585cb6a97c1d0d7adbd3cd5520':
  Fix misc-macro-parentheses warnings.

Change-Id: I383a744a932fa74f5169584456f8354102e7be44