Add parentheses around macro arguments used beside operators. Bug: 28705665 Change-Id: I9226f319e283be640eddc31687f75b51a8ef0ac6