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

Change-Id: I7ed1e6c8de18111275a128d44a523edd02e9833d