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

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



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