avc decoder: avoid access iterator after erase from map am: 6437903b7a am: 823a0375c0 am: 630d364295

Original change: https://googleplex-android-review.googlesource.com/c/device/generic/goldfish-opengl/+/25532835

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