surfaceflinger:Apply bugfixes to the correct hwc code paths