Merge "ART: Fix use-after-free" am: 1bfc9fc7bc am: 825a4fb07c am: 81e8ed85fb
am: 040a083181

Change-Id: I0f408efacaeb329ae1c874b6ea10c07c58d7ca7c