Merge "codec2 plugin: misc fixes" am: f2efd2a673

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

Change-Id: I1357ca006fba8e1e472b0fa42367b1f7e727cef3