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

Change-Id: I2442b6a6153508a875eb64eeaf572a83f587bcc1