am: c61e996b * commit 'c61e996b': Fix misc-macro-parentheses warnings. Change-Id: I538b5429a6a72a36061d15c50c9a06adf0b1c551