Merge "CCodec: limit # of active slots instead of # of client buffers" am: b44ae1f13d am: 893d887901 am: df778b169a am: f33f958abb

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

Change-Id: I54b1f667633d451ae14ea090c501dc292ba47068