Merge "Revert "hwc: Relax format change restrictions for certain targets""