Merge "codec2 sfplugin: remove MediaCodec.h dependency" into tm-dev am: 2bfbc46a am: 808f33e9

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



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