Merge "hwc: support 8x26 variants"