Merge "CCodec: Do not crash when there is no OMX service" into tm-dev