am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev

* commit '31518f745ffa5e832274c332ac957a065948fdaf':
  Use build property for CEC device OSD name