SF: Fix HWC2 build break am: 8fc10c310e
am: 30f7787017

Change-Id: If6b486b27f4963142d05f70a7d1c2de3be6281f2