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

Change-Id: Ia34ecb3a24fe7934370f39cf6dafcdfca4fe752c