Merge "CCodec: fix wrapping logic" am: d4c493dfd6

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

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