Merge "use stl containers instead of android containers" into main am: 0c9b3f98dd am: 24b0ef561a

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

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