Merge "codec2 plugin: misc fixes" am: f2efd2a673 am: 609c7e565f

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

Change-Id: Ibaac546a71629db766fe2db760c6ad0975564346