Merge "use stl containers instead of android containers" into main am:...

Merge "use stl containers instead of android containers" into main am: 0c9b3f98 am: 24b0ef56 am: 164d8c7d am: 7eef5173

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



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