Merge "Fix misc-macro-parentheses warnings in context-hub.h."
am: 81a5640cf9

Change-Id: I8c8c0f5e7fb079baab8dfdda5a5eb6f3256d6843