Merge changes I944dc1cd,I97c962d5

* changes:
  Track CEC version of CEC devices
  Add HdmiDeviceInfo#mHdmiCecVersion