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

Change-Id: I2d924bcab0a22823f5a179de6d983533a0e516f3