Merge "Fix build for non-HWC2 targets"