Merge "codec2 sfplugin: remove MediaCodec.h dependency" am: 04b50e2f am: 727204fe

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



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