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

Change-Id: I4185020854d8437188463df4df663aa67bc286ff