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

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

Change-Id: If3860faa8b582fa71a0aae72f5d7b795f53bf98a