[automerger skipped] Merge "CCodec: push a blank buffer at the end correctly"...

[automerger skipped] Merge "CCodec: push a blank buffer at the end correctly" into tm-qpr-dev am: 918a6f39 am: 32ebae3d -s ours am: a7b85615 -s ours

am skip reason: Merged-In I5f63a789a4fa7918f06ee46373eb88ae5f299f48 with SHA-1 99144330 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/21654185



Change-Id: Icf97c19e61597f0e5c3997cd8b5d7898e7583f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>