Merge "Make ART fail gracefully when it can't update the desired code."