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

Change-Id: I0131e74b001a9f1e56c456a52a327687e07b8955