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

Change-Id: I4601d7072c16322b70de9620a6bbaa41772d612b