Merge "Fix the missing std" am: 9a4e2bf66a

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

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