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

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

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



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