automerge: cde2617
* commit 'cde261796b3b38e05380ba186cb78350f83e2d30':
CEC: Fix a bug in HdmiPortInfo.createFromParcel().
automerge: cde2617
* commit 'cde261796b3b38e05380ba186cb78350f83e2d30':
CEC: Fix a bug in HdmiPortInfo.createFromParcel().