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

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

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