Merge "CCodec: Fix null check" am: 77a7eeff17 am: def290614b

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

Change-Id: If34625b0acf79f456a8d7c2c47f3ad8e8d012fcb