Merge "ART: Fix iterator invalidation" am: 6579b09978
am: 1818649915

Change-Id: Ice22c71834fefaa9f7e2ed63c6091656f924e45b