Fix misc-macro-parentheses warnings in shill am: e7126b88fd
am: baebe0b9d9

Change-Id: I0c51a4dec8e5dcc8c52a81fd30b73ba4e701e66d