Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev