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 am: 82a3ece3 am: 130393f0

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



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