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: I05d1e3c520aa8da483aa37c15f19f4f08daedb42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>