Merge "Fix unqualified-std-cast-call compiler warning" am: 7fdb60fd86 am: 4bd74b902a

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

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