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

Change-Id: Iac974deaf0c4a0df9512ff666ff382a18ad270b6