Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev