Merge "Merge "Improve performance by resolving MediaCodec.BufferInfo members outside of the frequently called code (like dequeueOutputBuffer)" am: 9687a71214 am: cc6014d9bc am: 0dc922ae17" into tm-qpr-dev