Merge "Fix the missing std" am: 9a4e2bf6 am: a9258263 am: 8af6434d am:...

Merge "Fix the missing std" am: 9a4e2bf6 am: a9258263 am: 8af6434d am: 60c9e713 am: 10a1ad79

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



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