Merge "Remove support for legacy HWC version encoding"