Merge \\\"Fix misc-macro-parentheses warnings in system/core.\\\" am: 495541c5bb am: 65828a0ec9
am: 4a8ab16746

Change-Id: I5ba2a6d0813eb728f5863801a36de6a012a8242a