Merge "Fix the missing std" am: 3e8d919b am: 65db3933 am: d3e4944c am:...

Merge "Fix the missing std" am: 3e8d919b am: 65db3933 am: d3e4944c am: fa7c9001 am: 3ffcb13a

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



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