Merge "ART: Fix use-after-free"
am: 1bfc9fc7bc

Change-Id: I646f5fbd7d822a251ea659510124c78b9c796d0d