avc decoder: avoid access iterator after erase from map am: 6437903b7a am: 823a0375c0 am: 630d364295 am: c1d0d32416 am: 06a6298dfe am: d1d634d66b am: cf42201561

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

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