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

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



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