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

* commit 'a4fe789a74d2eb0f1d14ab971103feacef02620c':
  Make ART fail gracefully when it can't update the desired code.