Merge "CCodec: Replace strtok with thread safe strtok_r method" into main am:...

Merge "CCodec: Replace strtok with thread safe strtok_r method" into main am: 7560aee2 am: fdfadb5e

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



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