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

Change-Id: I7431484a0245468fba58ed587d3235125f35cf8e