Merge "C2VdaBqBlockPool: reflects C2BufferQueueBlockPoolData change. am: 42116ed3 am: 40521db6" into tm-d1-dev-plus-aosp
mentioned in commit 6a87b584
mentioned in commit 972b1776