Merge "test-hwc2: fix build errors on other branches"
am: ea8d46f1ab

Change-Id: I15fb43deec4eac3bb2867fa4dd101606cb593389