Merge "sfplugin: import buffers before metadata handling" am: 508d01b8 am:...

Merge "sfplugin: import buffers before metadata handling" am: 508d01b8 am: 05db1ab8 am: c6e78bcf

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



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