Merge "CCodec: fix wrapping logic" am: d4c493df am: 72c93f5f am:...

Merge "CCodec: fix wrapping logic" am: d4c493df am: 72c93f5f am: 38c98dd6 am: 44a98a18 am: 15634e89

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



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