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

Change-Id: Idb404e8f99289a1492d7d3f1af938cf5c0f1c7f0