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

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



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