Merge "Fix misc-macro-parentheses warnings in hwui/tests."
am: e2732e5e38

Change-Id: If801b6f30a280ed8382c37765e2623eb3520ebcc