Merge "Remove HDMI CEC version constants"