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

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



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